Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 23 Nov 2005 12:35:50 +0000 (13:35 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 23 Nov 2005 12:35:50 +0000 (13:35 +0100)
Signed-off-by: Steven Smith, sos22@cam.ac.uk

Trivial merge